small improvements to parsing, remove some logging