Incorporate comments. Add FIFF unit names instead of hardcoding unit codes, unit handling, typos