bug fix and sass support