Added Contact.java, other small changes