fixing and adding some stuff