more improvements from actual use like title stuff