fix scaling and conversion bugs