Fixed some bugs, still not running stable