Minor changes + documentation