fix timezone bug
revert timezone fix, add comments
create whitespace function
Merge branch 'master' into derp