Numerous fixes, additional tests, etc. Partially working.