Fix #16 and a tiny html bug