ng - 1.4

Fixed your various remarks, should be good to go tomorrow morning!
Ok done