Module1 exercises improvements