WIP
Added better toString methods throughout
Mostly tests and demo stuff
Fixed issues with aliases in update