Finally no big stupid time loss but still a few mistakes

(time adjusted for better accuracy - crash)