Exception Refactoring; Collection Improvements; misc. Changes