Small design tweaks. Fixed some early bugs.