#20 some fixes, needs more