Most bugs fixed

Not sure about what still needs to be worked on. Possibly just
presentation.