Cleanup & Some fixes