Updated and fixed doc ans forgettings