Fixes #334. Fixes #328. Fixes #325. Fixes #345. Fixes #326. Some indicator fixes.