some small changes to the set and get thingy