make all
clean up some compile issues