Add a few variables and fix others