Lots of tittle cleanup for <code> and other minor fixes