made scss common - some other minor changes