attempted to fix some stuff