Small task manager update and other goodies