Added extra logging and fixed up defaults