Various fixes and skin progress