Leroy added to store, general cleaup