Fixing some errors in pretty much everything