improved a few things