various fixes according to staff recommendations
various fixes according to staff recommendations