language tweaks
minor todo additions
minor todo additions