addressing issues - fixed #18, fixed #17, fixed #16, fixed #14 fixed #13, fixed #15