Merge pull request #129 from mabrains/bjt_mim_all_variants

Fixing all issues for BJT/MIMCAP and cleaning it after testing for all variants