Finished Last Usecase.

Also fixed some enumeration issues. Please confirm that the changes did not brake any cross-referencing...