Z4l pass 1 and some updated code