Just some more documentation and commenting