Fixes bugs and improves html clients