few small updates

few small cleanups//more on the way