Fixes, additions