renamed a bunch of things, added cmd line tool