Oh god tons of fixes