amend require/ Import issues
and ran some code checks