and a few more changes