Fixes, some additions