Merge pull request #21 from Swap-Meet/g-details

G details
more modules
Merge pull request #22 from Swap-Meet/marissa

Marissa more module changes