Fix small bugs
Finalize