Some tweaks and corrections