master of science thesis - small fixes