rest added, conversation handling and small improvements