change strong references; small bug fixes