fixed couple questions