merge fix, other stuff