Minor changes
Further work on presentation