Improved a few things