a few more changes