update to r15
fix content assist wip