FINAL COMMIT
- fixed comments
- fixed AM-PM gap bug