altered .h delete slightly; updated assertions in .c