Final commit

Just changed some minor codes