fixes, additions