fixed 2MASS bug, added clean photometry requirement