Type hinting, meta field fixes, comments