Cleanup, various changes
Cleanup, various fixes