chalenge 3 second iteration

bug fixes
challenge 2 second iteration

bug fix