october update

code and style improvements