resolves #20; resolves #18

Got text location and scaling refined