!htp add some FIXMEs and small fixes