Fixed/added a few things