Updated some things, code doesn't break anymore