Fixes, TODOs, Ablaufdatum in Struct