fix for bug #76
fix for bug #81
fix for bug #72
addition fix for bug #81
fix for bug #79
additional fix for bug #79
fix for bug#75