Various changes. This envolves rights changes now :(