few corrections and lib folder