Bug Fixes

This fixes several bugs that should be fixed.