fixed few bugs
merged luka