fixes, new stuff and keywords