Added comments, other minor stuff