Updates from Issues #8, #14 & #20