files, state, optimizations

recommit