Some bugs fixed :D

Some bugs fixed :+1: