2 bugs were fixed