Updated to 1.7.4

Much refactoring and editing
A few more things to be changed before release