finished fixing compiler errors