address some stuff
some tweaks