fixes and auto loading modules