fixing issues
merged