minor changes + FIXED merge

not really sure if i've done it correctly, but seems ok kot--> able to merge?