more mods to ifelse
Merge branch '14-misc-cleanup' into 15