Pulled the latest platform and fixed minor bugs