fixed some stupid bugs?