Fixes #2 and removes hardcoded field setting that was used in debugging.