Improved marker locations.  Improved chopper behaviour and extraction and marker locations.