Polishing of rover puzzle and changed build to web.
Merge errors fixed, who knows what's actually in here.