more changes to get the geocat stuff working
more geocat stuff