final changes to close task #143

Multiple interface changes, additional fixes and input checks, some
layout adjustments to comply to the new requirements.