Tweaks and a bugfix.
wave drawing distance fix
Merge branch 'stable' into dev

Conflicts:
	TODO.md