Fixing some minor problems. Reverting older version.