edit entry; some todos; italic