Third commit

bug fixes