Some improvements

Fix it fix it Fix it fix it