Finalized, just minor fixes