issues #1 & #3, corected