Fixed parser, added fields.. IT WERKS