added various todos