Contribution limits apply across the board....

you should include the contributions from made through the employer with any additional contributions. So, if max contribution is 7K then you have 3K left to be made and would enter total of 7K on line 19 of the worksheet. 

Answer to question 2 is no.