Some Fixes + Cleanup all the things