stable to new-features

Merging branches for more extensive bug-testing.