Made changes to return things scaled to screen coordinates (hopefully!)