Mater of science thesis - some fixes