added shop functionality
added time formatting