some fixes and changed some packages