Fixed some bugs, nothing big