Clean up
Update timeinfo.py
Bloody typos
Merge remote-tracking branch 'origin/cleanup_branch' into cleanup_branch
no idea
better this time
Merge branch 'cleanup_branch'

on track with cleanup