Fix my errors
Revert some stuff. Doing one-by one.. adding barriers.