Add new stuff, fix missing bits