more cleanup
added entries, converted to simple html