fixing items 1 & 13 @Home