Several major fixes
Better debug messages
Put barrier back