consistent naming
Updated docs, minor bugfixes