Design fixes, Coffeelinter bugs fixed