Improvements, readme, fixes