Added skin system + small fixes