Fine tuned some things