Updated docs + bugfixing