Fixing issues.

I managed to break the repository but I believe I have everything back
in its proper place. Really need to use branches more often.