some changes and fixes :)