Fixed Matt's Bugs