Cleanups, fixed usage info