Updated readme. New cmdline options. Cleaned up some internals.