more fixes

Topics 1, 2, 3, 4 and 5