some fixes + stripping out skin specific stuff