Bug fixes and fixed spanning text