fixes chris's bugs