Fourth Commit

Finalising fixes