Comments, fixes incomplete unit test