Rev 4

Fixed some errors