added more html references, cleaned up 2.1