fixed bugs that I fixed before but got overwritten -_-