fixes, additions, etc