Samll adjustments + ready for test. Need to setup the hardware