Minor changes + notes + cleanup