fix minor bug and layout, suppress warnings (check!)