details
small changes
marcelkas remarks