minor bug fixes
final changes
merged