Almost reached v1 - Numerous fixes.