static prototype tweaks
merge