Small fixes and text changes