fixed some stuff should probably push