- redone "if statement" handling
More If tweaks. Fixes #43.