Minor bugfixes to controllers and routes. Removed User from public domain.