Completion of exercise 1 for vswe's entities lecture and also comments and other Misc chnges and fixes