Fixes #31
minor improvements to data getter methods