Now with usage info and generally less sloppy