re-add barriers, ending; css fix