quick fixes
user API implementation, more to come