Improvemts and updated documentation