Captain Ezio
Fixed minor issues working on major one
c973f55