Cleaned up code, commented, args handling added

Various goodies were added, and a more readable output is now
generated, as we are preparing for the Christmas deadline.