add statement and fixes