last fixes to sw coursework