bugfixes and small updates