Bu fixes, improved documentation