implemented logout and more "niceness"!