made more changes to hopefully be ready for playtesting