Modified documentation + small changes