Fixed Peter being a bitch, and the unused vars