some controller changes
Merge pull request #16 from girb0t/database

some controller changes