fix compile errors. still has move/forward problem.