Added convenient macro LET-IF and some quick bug fixes