removed manifest comments, updated TODO