bug fixes involving GIVEZ statements and others, more comments added