minor improvments and notes