Some more final changes to CE lab 6