Small fixes and updating the docs