Fixes for #11; sibkeys were broken in a few places; in decent shape now