Note change and general fixes