change some paths
remove a console log
fix merge
finish basics for ga extra