Removed boxing warning.
Flip timelines, minor clean up.
Merge remote-tracking branch 'origin/master'