diff --git a/src/Flux.jl b/src/Flux.jl
index 7746ecff..5f7bbdfe 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -7,26 +7,25 @@ module Flux
 using Juno, Requires, Reexport
 using MacroTools: @forward
 
-export Chain, Dense, RNN, LSTM, GRU, Conv, Conv2D,
-  Dropout, LayerNorm, BatchNorm,
-  SGD, ADAM, Momentum, Nesterov, AMSGrad,
-  param, params, mapleaves, cpu, gpu
-
 @reexport using NNlib
 using NNlib: @fix
 
 include("tracker/Tracker.jl")
 using .Tracker
-export Tracker
-import .Tracker: data
+using .Tracker: data
+export TrackedArray, TrackedVector, TrackedMatrix, param, back!
 
 include("optimise/Optimise.jl")
 using .Optimise
 using .Optimise: @epochs
+export train!,
+       SGD, ADAM, Momentum, Nesterov,
+       RMSProp, ADAGrad, ADADelta, AMSGrad
 
 include("utils.jl")
 include("onehot.jl")
 include("treelike.jl")
+export params, mapleaves, cpu, gpu, onehot, batch, glorot_normal, glorot_uniform
 
 include("layers/stateless.jl")
 include("layers/basic.jl")
@@ -34,6 +33,9 @@ include("layers/conv.jl")
 include("layers/recurrent.jl")
 include("layers/normalise.jl")
 
+export Chain, Dense, RNN, LSTM, GRU, Conv2D,
+       Dropout, LayerNorm, BatchNorm
+
 include("data/Data.jl")
 
 @require CuArrays include("cuda/cuda.jl")
diff --git a/src/optimise/Optimise.jl b/src/optimise/Optimise.jl
index c07ba218..5d5d9ea0 100644
--- a/src/optimise/Optimise.jl
+++ b/src/optimise/Optimise.jl
@@ -1,6 +1,6 @@
 module Optimise
 
-export update!, params, train!,
+export train!,
   SGD, ADAM, AdaMax, Momentum, Nesterov, RMSProp, ADAGrad, ADADelta, AMSGrad
 
 struct Param{T}