fixed bug
more changes