bug fixes
Merge pull request #6 from dcornnell/front_end

bug fixes