final version before lab section

Further changes will be after actual lab section. Comments are not aligned.