Readme update & fixes