fixed a few bugs and fixed container
removed system.out's