Improved a lot of thins