Fixing some errors and bugs.