fixed couple things