Cleaning up a few details

Fixed wig Parsing for variable step with no span
Merge remote-tracking branch 'origin/devel'

Minor fixes on wig parsing.

Removed redundant swig artiface

Minor formatig changes