Took care of #8, #9 and #14