Making speak look better and function a bit more