Fixes and tidieness... unifies API.