Priority Bug Fixes

**Still ongoing - don't merge this yet**