Priority Bug Fixes

**Ready to go**