Fixed some omissions / addressed comments in the previous commit