minor updates, bugfixes