fixed all stuff