oups not in java -_- and small design changes for debugging