more bugs fix