less bootstrap and some fix after visual studio disasters