* Finish V1 corrections and fixes to initialize cost model * Finish V2 corrections to be inline with mainnet today