fixed an error and added some more