fixed all known issues