Bug fixes. Basic functionality should now work.