Some small design fixes and ordering stuff