misc
yay, thats been annoying the shit out of me
merge conflict
update to earls