Fixed compilation errors. Silly me decided to change interfaces without testing what I broke. Lots of minor changes to names and member accesses.