Accumulator is fully working
Small face lifts to files