Hopefully this prevents any issues Randall can cause when resizing
Merge pull request #2 from Runnable/more-fixes

Hopefully this prevents any issues Randall can cause when resizing