updates reflecting merge with psychopy plan
typo