0.3.6: language changes and warning fixes.