Fixed things, added other things