some bugfixes, improved imports, added basecontroller