Hardening code and readme update