commit sundries

From episode 5 branch create