02 Basics minor changes, solved some comments