Additions, fixes, changes