Fix error in writeback and add more to pipeline