add default controller; other minor improvements