cleanup, removed Exceptions at many places, better value checking...