Some validation and documentation fixed