Added semi-colons.

Also added part of the final conditionals.