fixed Todos and check for userID
Merge branch 'master' of github.com:TN1ck/aal