fix archetypes and minor refactor of ocl execute interface