minor fixies
push for merge