minor changes...

mostly change `if` statements.