Some number fixes

not completely done! see TODOs in configs
Fixed lift
Fixed IR
Fixed block