Polymer fixes

these fixes the issues I've stumbled over in the current polymer-related keywords (so far)...