More improvements. 76 working