fixed all bugs possible