parser works now, cleanup