Changed Some Skills And Fixed Some NullPointer Bugs