add reflect and ref and fix the masonry problem
merge changes from korn's branch
Merge branch 'klaoha06-korns_branch'