Bug fixes
final touches