Fixed overlapping text (thanks to yuhuitech on GitHub), miscellaneous improvements