small changes and fixes