notes and small fixes