Added skin, various improvements