Updated some things, about to make changes to widget