fixed a few bugs in changes