Temporary Stage 8;

Some cosmetic changes to make the repository look good;