Problem 2 fixed.  A little messy with ROWNUM and multiple selects.