New options, test html, optimize fixes