Cleanups, linking fixes, visual improvements