ack. so many little changes.