hopefully, final fixes for todonotes