Fixed a few bugs and changed arena based code to suit new getters and
sestters