Beta 1.0

Fixed more bugs, uncovered even more. Going to have to do for demo day.