Stability updates and other improvements. Added TODO note for edge case issue.