Some work on some test patches, mostly layout stuff