Various comments and cleanup that prove I don't care about proper commits