Fixed things to make them actually load

And added stuff