Changed schematic + small fixes