Cleaned and added more mob fix's