(Xronos) Pipelining, adding members and some fixes