some changes that need merging

i guess