Fixing issues #1 #3 and #5