last bugfixes before sidebar+master reunion