fix verious issues