Minor changes, code now compiles.