small changes + started statistics

test.java is a temp