commented out execution lines for debug
updated per merge with local for fixes, robust parsing