Mistakes reported by Jakub are fixed. Third commit