uncomment stuff
uncomment finalization
fix code