some changes and fixes...