Change name and fix/improve some stuff