Final fixes added...