forgot some important files and adding @jingman 's fixes