fixed code stuff