completed new Geoff parser including support for legacy formats