Minor changes; made collection beans really comparable