- By Benjamin. Various bug fixed.