few Notices fixed & billing progress