Production: casting tabs and functionality clean-up.