James | Made a lot of tiny updates