Further Cleanup

-- remove inline bold
-- clean up text
-- move a few things around.