Resolving #5, adding these as per comments