Updated contact info and cleaned up a bit