Fixes 2

Lot of fixes after finishing (alpha) hardware