Bugs and info

After test