Last cvhanges, added more variables to clustering, fixed error