Subscription ui

Subscription UI fixes moved to cleaned, up-to-date branch. Please merge.
Add some java docs to each method (add value to your code)