Fixed some code and some PR