Add boolean tracking, make a couple things match up to spec