fix noted issues