18/02/14

minor changes to extraction, testing