Fixed major graphical bug, and added in some geometric fixes.