Added support for all other modes and fixed README