Beautified pours, some fixes