Improved a couple of stuff