Issue Fixes

This patch has fixes for Issue 81, 80, 75