finalize & fix incomplete module