added more controllers, fixed a bit here and there