stupid bugs were fixed