Peacock style

Also adds better debugging content...