small changes throughout