Fixed a silly error and added things (see code)