fixed state methods, indents, typo's and equipment init