fixed the problems :)
merged