Added some options, fixed duplicate skills