fix airbrake todo
update comments
add locator