Fixed some bugs, tweaked some settings