Cleaned up some quirks with adding and removing skills.