Added missing categories, fixed warnings
Fixed incorrect method name