more cleanup, fixing compiling errors...