Down and OnUp

Adding changes I've been using for a while and haven't pushed from Mac OS X.