minor updates and bugfix