Fix: last fixes in program
Thesis: last fixes in thesis