fixes and additions for blackcat module