updates: usage information, code cleanup