Fixing some bugs

Next is working on contacts