Fixed open bugs listed

Fixes for:
1) Bug 4
2) Bug 8
3) Bug 11