various updates for prototype v2