More updates and cleanup to readme