A combination of a couple of issues...

Held here till it can get into master either from the origin or from a Pull Req

- #37 - Better screen width and height calculators
- A better handling of non-URL files