Fixing some errors and small changes.