Some bugs fixed

Some bugs fixed, model ready for Myfish SWWRAC simulations