removed some todo's, removed sysout for TarFluid