Miscellanous mechanics fixes and updates