fix indent in web.xml
a few bugfixes to match algorithm
formatting/ui tweaks
more formatting/ui tweaks