Updates to fix issues #78, #77, #76, #75, #74, & #73,

Updates to fix issues #78, #77, #76, #75, #74, & #73,