bug fixes and formatting, added a conditionizr conditional