fix #10, #11, improving html formatting