fixing some stuff now