Fixes and some changes, getting the Skills in there