Minor fixes and shit