many small tweaks in cube assembly