fixed various issues, added all user stuff!