quick fixes (copy-n-paste issue) + better scoped