updates and merging of includes/core.js