Misc fixes & fix conflict/fucked up history