Bugs fixed, bugs added

Signed-off-by: GIRAFF <giraff.giraffov@gmail.com>