more bug fixes
final changes