Updating comments, adding a couple utility functions