small changes, bugfix