- By Benjamin. Various bugs fixed.