code comments
bugfixing: update
simplified controller code
simplified code