Minor code changes and readme update