some quick fixes
few tweeks
Merge pull request #13 from dcornnell/front_end

Front end