Fixed things and made stuff pretty