07: fix upper case in 01
07: fix stupid mistakes in 02