fixed stupid stupid stupid bugs :sob: