Project Users Management
bug fix
code cleanup
updated todo's
fixes