some changes to different stuff