Updated design of some minor things.