#55: Fixed a bug in TextField
#55: More bugfixes