Some tweaks done