bug fixes and cam-follow