Mshot request now handles 307 response
Mshot scaling now works reliably
Minor tweaks and code cleanup