Better docs, more options, cleanup