Updates to speaking and some bugfixes