Fix and documentation modifications