various
fixed test
misc
various