fix parsing of costs and feature steps
merge and clean up