bugfix - various improvements


git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@9843 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0