Correct SASS Build conf
Various updates