Updated stuff, i'm not evil >;(