updated extension/ clean up whole project