Fixed some bugs, kinda stable