Updated documentation, minor fixes