Added corrections and some enhancements from fjies/ocDashboard