update methods, attributes
fix attributes, methods