fix for bug#80
fix for bug #74
fix for bug #78
Fix for bug #83
fix for bug #68