Improved a few things here and there