kinda fixing bugs again