more localization. Closes #33