Small changes + docs updated