Polish Camera and Question VCs - only partially
merge from last commit