modman: fixing & adding more features