fixed three todos