OMG. fixed stupid bugs