minor client side refactor, added header, defaultController fix doc