fixes. before rewrite of entrypoint sub-sect.