more bugs fix etc...