nothing major. just some small breaks and a conditional