forked from tangled.org/core

fix a few final bugs master


+22 -19
3 changed files