various bugfixes and some fields added