S'more small changes