some minor fixes and rearrangement; added Time module
Some rearrangement, and Time module laid out