Even more pre-scrimmage updates

Remember to merge branches!