some cleanup to camera/motion..but not quite fixed yet