Some tweaks & README update