minor refactoring, minimal time format, added .app