Various Updates from CastagnaIT thanks to him