Push many updates - few minor bugs to fix