Bug Fixes

Even thought this branch is called sendFile, I'm merging back in to fix some bugs.