some fixes

header still isn't fixed but is a bit better