Added some shitty improvements