slightly saner source, updated readme