Fixes, partial implementations.