contact draft done and some fixes