Updated docs, minor bugfixes