sort out commenting for scss files finally and updated two bundled submodules