More or less complete

Comments added