tweaked palyer, recoded CollHandler, minor
resolved mergeConflicts