some corrections, still have checkstyle checks toi correct
more slight corrections deps etc