Snapshot 2.5

Just some new implementations and fixes.