Fixed issues and documentation