All errors fixed, wifi added
Next commit will be pre-merge into master.