Updating some bugs with structure