[everything] Some style fixes
[core] Reload more stuff, working around reload bug temporarily