Some additions
More of dem' changes.