Fix some more stuff and add contact info