Cases done, and more misc fixes
Turn $ into normal function application. BEWARE it shows there is something broken with app.