Setup module setup - corrected comments
Dashboard performance improvements

(#2)