fixed a whole bunch of misc issues' mainly around incorrect data.