changed a couple things, bug fixes