ready for relaunch

changes made, ready for re-launch on new geoserver