Layout fixed (well to first approximation anyway), debug messages disabled