add some variables and top fixed for things that may want to stick around