bug fixes, small style change
Merge pull request #143 from dennishendriksen/master

Data explorer bug fixes