Fix 1 2 3. fixes #410
Fix 4 5 6. Fixes #410
fixes #410 Fix 7 8 9.
Feature 1 2 3. closes #410
Feature 4 5 6. Closes #410
closes #410 Feature 7 8 9.