small fixes, overall fine