Updated some code here and there