Removed more junk and corrected some syntax