cleaned some code, added another category