bugs fixed in first pase delivery