ADDVAR -> DECLARE, fix exceptions