started computing results, fixing minor bugs