more small changes
fixed merge conflict
fixed some merge fuckups