Fix bugs
cleanups