Added date command
Add command
fix bugs and clean up