killed 2 bugs from the last commit