Change header guard, misc changes