Fix bugs
Cleanups