Last functions. Final touches.

Putting last touches which include functions and semi-colons missed.