Added rats, bug fixes