cleaning up + fixes
Merge pull request #3 from ipa-fxm/indigo_dev

cleaning up + fixes