a few changes and bug fixes