Minor updates, needs documentation to be finished