Textfields and a few bugfixes