Adding Contact and some small fixes