simplify references and fix module
1.0.8