I have implemented more of Kira's suggestions. Some of the exercises need more time...