Fixed a couple things; added handler