final/contact

fixing bugs