fixed various 500 errors in admin, add action, water page