some changes + fixes