Update polymer properly and make some changes to main script