work on fixing some stuff