Bug Fixes and Really Small Changes

We fixed a few things that were shared with us. Nothing to actually keep track, but changes none the less