some fixes & contatc form