Minor code changes
Minor README changes