Was missing a few semi colons.
More cleanup and fixing some warnings.
Conforming to strict rules.