merge working code from other machine into repo
cleanup warnings in layout about string literals