Camera update. Minor fixes.