close #101
close #102
Merge pull request #106 from rhsu/frontEndFixes

Front end fixes