Some small fixes, add works