Fixing compile error, adding/expanding toString methods.