Readme update plus some minor changes