Fixing some problems and correcting info