More fixes and additions. Ready for playtesting now.