Fixed bugs and less