Fiexed some errors, build 0.9.1.21