fixed a few functions, still working on adding and removing users properly