added a shutdown shortcut
some cleanup