Added Boolean- and StringField handling
Smaller cleanups
Smaller cleanups