Fixed things that broke
Fixed more things that broke