cleaned up debug message
Fixed some errors in parsing