fixed much problems