Issues 3 & 4 solved