more segments and a few minor tweaks to others better speed running