Bugfix and wheatstone layout