Fixed a small mistake, added Profile+Skin support, cleaner.