fixes and shit