Fixed all skin issues. Fixes #124, #121