merge to release 0.3.4.2. fix text wrapping, soft lock at oak, and GTS
