In this milestone we mainly want to consolidate and finish open issues. This might include restructuring of crucial parts for future work.