fix all bugs. Nearly Done. Wait for it :-)

Signed-off-by: lequana2 <lequana2@gmail.com>