Captain Ezio
Minor fixes and improvement
809532c