More updates for issues #15, #16 & #17.