Fixed a some bugs