Updated some things here and there