more fixes, better vcp