Better readme and comments