Minor changes + new documentation