More work & Readme update