minor fixes everywhere 凸(¬､¬)