"I did some of the night rating within the 45 hours as I had time to use up after the skills test (this can be completed after 35 hours if I remember correctly, then you can make up the 45 hours consolidating"
That is NOT permitted under JAR-FCL - you cannot 'use up time after the Skill Test'. You must have completed ALL training and experience requirements BEFORE taking the Skill Test; practically, if you've achieved all the requirements and have around 42:30 TT, then if the Skill Test takes at least 2:30 you will be OK. The Night Qualification (there is no 'Night Rating') may be taken during the basic PPL course.
You should receive up to 10 hours total credit for 10% of your gliding P1 time only. The Silver 'C' allowance died with JAR-FCL....