small issues: autoload, maps