Added some basic design and stability fixes.