Bug Fixes and Improvements

I forgot…oops :D