fixed bugs
mergered again