Further improvements

Still not there yet!!! I don't understand!