Controllers added, various bugfixes