Fixes logical errors and improves player message