Fix some bugs
Relfexion about next anoying task