Fixed #3
Improved text renderer + small tweaks.