Oslo den 22/8

optimated code and added features concerning correction of results