Fixed some major bugs finded, huh