minor fixes, probably needs RANSAC to work right