fixed something, bugs added
merge