added some more keyboard shortcuts
rewrote objects, to be more functional