Fixed scapper
Minor improvements to web