fixed stupid bugs :)