more bugs fix3