#2 and #3 fixed.