Huge update

Implemented more functions and user checking