JeremyLikness Updates based on Anthony's feedback

Users who have contributed to this file

• CamSoper
• JeremyLikness
• sptramer