added test maps from webpage
some bugfixes