More magic number removal, and fix tooltips