fine
packaging cleanup
parse tweaks