ws
minor
misc minor changes
fix #1163