More documenting, standardizing command arguments, etc.