minor bugfixes. more remain