Oblig2 added - and fixed a few bugs!