some small fixes and implementations drafts